how to resolve git conflict and merge code